Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[8.x] ci: fix benchmarks cleanup (backport #14334) #14336

Merged
merged 2 commits into from
Oct 11, 2024
Merged

[8.x] ci: fix benchmarks cleanup (backport #14334) #14336

merged 2 commits into from
Oct 11, 2024
+2 −5

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 10, 2024

Motivation/summary

The benchmarks workflow does not clean up all the resources it's creating.

In this workflow run you can see that the Spin up benchmark environment step creates 22 resources.

But the Teardown benchmark environment only deletes 9 resources.

The reason for it is the differently passed TF_VAR_* environment variables in both steps.

This change fixes it and aligns the passed tf vars to both apply and destroy.

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

I was able to test this change in https://github.com/elastic/apm-server/actions/runs/11277362803/job/31363323001, where you can find 22 resources being destroyed.

Related issues

This is an automatic backport of pull request #14334 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from a team as a code owner October 10, 2024 16:09
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 10, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 10, 2024

Cherry-pick of 9499f3d has failed:

On branch mergify/bp/8.x/pr-14334
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 9499f3dea.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/benchmarks.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@reakaleek reakaleek requested review from 1pkg and a team October 11, 2024 13:03
@1pkg
Copy link
Member

1pkg commented Oct 11, 2024

@reakaleek I think the original mistake on my end was to not backport this PR #14245 properly, that's why we now think all the conflicts when backporting CI changes. I reoppened it and will properly backport it now, so we don't need to deal with conflicts in CI.

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 11, 2024

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.x/pr-14334 upstream/mergify/bp/8.x/pr-14334
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-14334

@reakaleek @1pkg
ci: fix benchmarks cleanup (#14334)
2fa9368 
* ci: fix benchmarks cleanup

* ok

* test

* uncomment again
@1pkg 1pkg force-pushed the mergify/bp/8.x/pr-14334 branch from 109b721 to 2fa9368 Compare October 11, 2024 16:17
@1pkg
Copy link
Member

1pkg commented Oct 11, 2024 •
edited
Loading

@reakaleek I merged CI changes backport to 8.x, and rebased this backport so everything looks sane now. The merge conflict problem should no longer appear in the future. Sorry for the initial conflusion.

@1pkg 1pkg mentioned this pull request Oct 11, 2024
Merged
2 tasks
@1pkg 1pkg removed the conflicts There is a conflict in the backported pull request label Oct 11, 2024
@mergify mergify bot merged commit 2a89441 into 8.x Oct 11, 2024
13 checks passed
@mergify mergify bot deleted the mergify/bp/8.x/pr-14334 branch October 11, 2024 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1pkg 1pkg 1pkg approved these changes

Assignees

@reakaleek reakaleek

Labels
backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@1pkg @reakaleek